Adapt to simplified file chooser portal api
authorMatthias Clasen <mclasen@redhat.com>
Wed, 6 Jul 2016 16:54:29 +0000 (12:54 -0400)
committerMatthias Clasen <mclasen@redhat.com>
Fri, 8 Jul 2016 04:08:17 +0000 (00:08 -0400)
OpenFiles is gone, just set the 'multiple' option instead.

https://bugzilla.gnome.org/show_bug.cgi?id=768499

gtk/gtkfilechoosernativeportal.c

index a8e0fc7f16f1dcc715856ae494b8de305542bf75..8ff2a46bc131526a43a55bf75ff89ab8db11ad11 100644 (file)
@@ -298,10 +298,8 @@ gtk_file_chooser_native_portal_show (GtkFileChooserNative *self)
   action = gtk_file_chooser_get_action (GTK_FILE_CHOOSER (self));
   multiple = gtk_file_chooser_get_select_multiple (GTK_FILE_CHOOSER (self));
 
-  if (action == GTK_FILE_CHOOSER_ACTION_OPEN && !multiple)
+  if (action == GTK_FILE_CHOOSER_ACTION_OPEN)
     method_name = "OpenFile";
-  else if (action == GTK_FILE_CHOOSER_ACTION_OPEN && multiple)
-    method_name = "OpenFiles";
   else if (action == GTK_FILE_CHOOSER_ACTION_SAVE)
     method_name = "SaveFile";
   else
@@ -345,6 +343,8 @@ gtk_file_chooser_native_portal_show (GtkFileChooserNative *self)
     }
 
   g_variant_builder_init (&opt_builder, G_VARIANT_TYPE_VARDICT);
+  g_variant_builder_add (&opt_builder, "{sv}", "multiple",
+                         g_variant_new_boolean (multiple));
   if (self->accept_label)
     g_variant_builder_add (&opt_builder, "{sv}", "accept_label",
                            g_variant_new_string (self->accept_label));